Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Nov 2011 07:04:48 +0000 (23:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Nov 2011 07:04:48 +0000 (23:04 -0800)

Trivial merge